branch test
and simple
& simple
conflict fixed
o file
delete ing.o
file
delete it
me
dev