fix CONFLICTS, add demo scripts.