change cat version
add can.txt files
handle conflict