adding new pics
conflict