various bug fixing with conflict resolution; rewrite div-based in-memory schedule record