add .txt
added commit-remote.txt
fixed conflict