Updated create push new file
Updated collab merge
Added silent bad merge exercise
Updated starting repo for collabMerge
Updated starting repo for createPushNewFile