Removed some gunf from a merge conflict
Merge pull request #2 from nickcolley/fix/style-merge-conflict

Removed some gunf from a merge conflict