resolve the conflict
quit()

n
resolved conflict