'Merge' demo and clock changes