Commiting a file that conflicts with file on repository...
Need to upload many classes to merge conflicts...