Remove conflict notation.
Merge pull request #1 from bshelton229/fix-merge

Remove conflict notation.