trouble shoots merge conflicts