You got conflicts when you rebased, and committed the conflict markers.