correct some merge conflicts