Added commit-remote.txt
Removed commit-basic.txt
Fixed conflicts