add commit-remote.txt
fix conflicts