Dots integration to TimeMachine
Fix conflict