merge cats into master