...
Let the sync run. It only sync's what has changed so it should be quick.
When it's done the Last sync on date should be in the recent past. If there are conflicts go ahead and try to resolve them. Usually the newer file is the one you want to keep. If you're in doubt save them both.