Merge conflict re-resolved