init black branch
init new branch
v2
test
resolve conflict
init one
clean master
Merge branch 'one'
cleaned master