Fixed git merge conflict push
Merge pull request #2 from Inconditus/patch-1

Fixed git merge conflict push