fixing merge conflicts?