Added remote commit file
Added commit remote file in master
Commit changes to resolve merge conflict