Remove git conflict comments from source