:wq
cleaning up
fixed merge conflicts ?