got rid of image gem related stuff
resolved merge conflict