resync-commit from laptop
resync-commit-resolve