If you're asking about client clock hijacking: a client should maintain it's own internal clock based on timestamp it gets from server and time span got from local clock.
So you just update 'client timestamps' relatively to server:
- Client record has CT1 update time;
- After connecting to server at the moment of CT2, you find out that server time is ST2;
- So record update time is changed to ST1 = ST2 - CT2 + CT1.
The other way is maintaining the same transformation at server side. (Which is probably more correct and secure).
And sorry - just a note - odd part is that you call it 'conflict resolution', when it's more 'last update wins' and no actual resolution is performed.