modify dev for the first time
gg
dev 2
conflict fixed
add sth
merge with no-ff
this one