merge
merge
git commit -m merge