catalogue added
fixed merge conflict