added hahahah
merge:
git commit -a -mmerge:

git status