Remove hanging conflict marker
Merge pull request #128 from Metaswitch/sto552

Remove hanging conflict marker