We will use the term merch instead of goods
Complete the change
We are now creating the post type with conditional data