merging
fix conflicts
added bg colors, images, styles