removed conflict markers generated by GitHub