Add cat
fix merge