View Single Post
On the iPhone, choose "Local". Then the next time you sync your Mac, you'll get a similar error. This time you'll want to choose "Server" (because that has the iPhone's data now).

If this happens again and you can figure out how the databases got confused, could you please send us an email? We'd love to fix the bug!