branch test
 AND simple
 & simple
conflice fixed
add merge
merger with no forward
merger with fast-farward
fixed issue001
merger bug fix 001