Working on merge conficts conflicts