Changed data type from alarm to schedule
merging
resolving conflicts