Removed unnecessary text

Removed unnecessary text added by git because of a conflict