merge
merge

git pull
:q
z
:c