resolved merge conflicts with slick rick