conflict merge problem