feature-branch-remote branch file with content added
additional file
seting up conflict via commit-remote.txt
fixing merge conflict in commit-remote file