fixing merge error on clock-8960.c