Added clock.c
Resolved conflict