Fix merge conflicts properly