Chnged styles
Resolved merge