I think I might have screwed things up. Working on a project on a dropbox with two separate machines. There is no backup. Looked at some of the other threads under this category and wasn't able to find a solution that seems to fit.
So... there's a obviously a conflict in the object directory. Is there anyway to fix this?
It's ironic because I just went through the command 's' checky messages in Adobe Character. If you haven't tried it keep pressing the hotkey for save and you'll find a series of jokes.
I also promise to use save as for versioning in the future. Especially after doing a TON of work on the project.