Added commit-remote.txt
Added conflicting commit-remote.txt
Merged feature-branch-remote