Commit Basic 2 added
Commit file added in Merge
Merge Conflict resolved