commit remote txt
commit remote in master
resolved merge conflict