Commit Remote File
Commit remote file from Master
Conflict resolved