commit remote branch
fixed conflict on commit-remote.txt
fixed conflict in commit-remote.txt