New file will be created
New file will be created

conflict errors, new file will be created, disregard all files prior to new file
SMMC-Web-Design/2016_1_PurpleRing,AlexisLanuza/2016_1_PurpleRing,AlexisLanuza/2016_1_PurpleRing,SMMC-Web-Design/2016_1_PurpleRing