Fixed merge conflict in products/index.haml view