adding drawables
resolved merge conflicts