add custom clock view
fix conflict