comment out ready in ucdsjs
fix conflicts