preparing merge conflict for ultimate mergedom