removed merge conflict text

>.>