Fixed some merge conflicts and ran update_catalog