branch dev
AND simple
123
conflict fixed
add merge
merge with no-ff
commit css-photo