Resolving merger conflicts