branch test
and simple
&
conflict fixed
add a line in the end
aaaa
hahah
Merge branch 'dev'