you must have merged or pulled at some point. replace everything between <<<<< HEAD >>>>>> FETCH_HEAD with whatever is right