Fix line duplicated in merge
Merge pull request #14 from Metaswitch/fix_incorrect_merge

Fix line duplicated in merge