remove merge conflict that stuck around