Product Route and list function
Merge conflict