Update cat
Fix conflicts