Collaberate Issues

Im working with a group on a collaborate project. when i try to upload, it says i must fix conflicts prior to publishing :

98736-screen-shot-2017-07-29-at-84559-pm.png

The console has no errors, and i fixed all conflicts with files, so what the heck?

If you know how to fix this, PLEASE tell me! I would be very grateful!

Wow nvm its fixed :I