Sneakpeek->QEats->Python-> How to resolve merge conflict? ( Inside Crio Workspace )