converted over feature products to be 5 columns
fixed merge conflict(s)