banner updates
resolve conflict
Updated single product template
Updated single prod template