Fixes merging artefact, three lines were accidentally duplicated
Merge pull request #892 from GreatApe/master

Fixes merging artefact, three lines were accidentally duplicated