Restore from wrong merge