commit-basic.txt
removed file
added txt file
adding commit-remote txt file
fixed merge