adding commit-remote.txt for feature-branch-remote
adding commit-remote.txt for master
reserved conflicts