Fixing Jim's Clock as I manually merged it. Waiting for Jim to help me solve it :)