fixed conflict marker

I found conflict marker.
I removed it.
Merge pull request #7 from okonomi/patch-1

fixed conflict marker