some styling stuff
resolved merge conflict