test merge
feature added
master added
conflict fixed in feature
master code more
finished today work
master merge feature
master 4 add
clean
add f 1
add m 2
merge m to f
add m 3
add f 4
merge f to m
add m 5
add f 6
merge m to f 3
add m 6
add f 8