Fixed error made during merge

removed garbage text inserted by git during merge