Chuck dev

add and fix conflict