Removed 'remote:' from GS responses
Updated strings in createPushNewFile
Refactored conf splitting. Also split repo conf.
Added config for mergeConflict exercise