Maybe starting over would solve this, follow the guide: How to fix synchronisation issues and start over