correct merge conflicts