Merge problem resolving