committing remote feature branch
committing commit remote in master
fixed merge conflict in commit-remote.txt