Clock now works - Fix merge conflicts