Fixed git conflict tags showing up in code.