06_rebuild and conflict fixing