change catalog
fix merging