merge problem correction