Sync'ing everything after a messy merge and restore