branch test
AND simple
& simple
comflict fixed
or complex
|| complex
add merge
fix bug 101
merged bug fix 101