Eliminating merge conflict prior to merge