resolve forgotten merge conflicts