minor theme work
resolved merge conflict