Fixing issue with bad merge

Some merged files contained traces of the merge (bad). Fixed