Remove conflicted file
Merge pull request #3 from Zillode/ConflictedFile

Remove conflicted file