commit-remote in feature-branch-remote
added commit-remote.txt in master branch
fixed conflict