deleted merge conflicts