catalog
catalog working
using inference
fixed merge