Remove git merge markers
Merge pull request #1168 from kevinwestern/patch-1

Remove git merge markers