Created commit-remote.txt in feature-branch-remote
Created commit-remote.txt in master branch
Resolving conflict between two commit-remote.txt