You forgot to remove the conflict markers and actually resolve the conflict, both sides (======= separates them) are still here.