DM1ComparisonManager encountering inconsistencies

I'm running ER Studio Data Architect 16.5.0 with Team Server Version 16.5 I am  having problems with DM1ComparisonManager encountering inconsistencies   and refusing to save/check in a diagram,

I get the following error:

If I try to clean the active file folder and try to checkout it gives me:

Repository operation failed. Cannot create GET_LATEST request.
00:00:00.031 - Total time for the whole process.

Anybody else out there having the same issue? I have a support ticket open for a week but no solution insight. Do we need to go back to older version.....?? Any help from the forum guru's will be appreciated