You have some cruft left over here from rebasing. You should be able to remove this and the three lines below starting with ==== and ending with >>>.