Fix unmerged conflicts