Removed something that remained from a merge error