merge clock changes