commit feature-branch-basic
commit-remote in master
add commit-remote.txt to feature-branch-remote
fixed merge conflict