Commit remote file from Master
Conflict resolved
Commit-3 File Added
Commit Merge File Added
Commit Rebase File Added
Merge branch 'feature-branch-merge'
xcode project added