After conflicted merge