Remove git conflict text