commit-remote file
commit remote in master file
fixed conflict
commit-3 file