Updated ClockAide Schema

Updated ClockAide Schema
Resolved Conflicts

Resolved Conflicts