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