These ">>>>" indicate that you have a merge conflict.