commit-remote in feature-branch-remote
commit-remote in master
fixed conflict