Fix result of merge conflicts