Improving the resiliency of sync

Removed rerere