conclusion added
for merge
conflict
new pics