adding line in Xcode for conflict.
Merge remote-tracking branch 'MyGitHubRepo/master'
coming after merge.