commit-remote txt
commit-remote.txt
resolve conflict commmit-remote text
commit