Remove merge conflict artifact
Merge pull request #28 from hynek/master

Remove merge conflict artifact