Merge conflict resolved with minimal bloodshed