Merge conflict?

I'm trying to upload new files but run into a problem. Both `gin upload` and `gin download` throw errors. Any idea on how to resolve this? The merge conflict message is empty. Previously there were 2 files listed that I deleted in the web interface to try to resolve. Now no files are mentioned but the error persists.

`(base) chris@chris-mh16 $ gin commit .
:: Adding file changes
Nothing to do
:: Recording changes
No changes recorded

(base) chris@chris-mh16 $ gin upload .
:: Adding file changes
Nothing to do
:: Recording changes
No changes recorded
:: Uploading
upload failed: changes were made on the server that have not been downloaded; run 'gin download' to update local copies
[error] 1 operation failed

(base) chris@chris-mh16 $ gin download
:: Downloading changes [error] download failed: files changed locally and remotely and cannot be automatically merged (merge conflict):

`