I don't know enough here to say anything definitively, but I think knowing there's a conflict is half the battle. UTC timestamps are great but clocks have to be perfectly in sync which is unlikely even w/ NTP. And as you mentioned doesn't withstand users changing their system time.
Sometimes bubbling conflict resolution up to the user is a good idea. It's preferable to data loss.
UTC timestamps would solve the issue, unless you lied about your UTC time (hence the time change question).
I must say, unlike the first respondant to my post, while I agree it should never happen -- I think understanding why it did is interesting in of itself. But I'm just one of those people who likes understanding how people make mistakes in software.