rebuild_fast re-merge and ordering