branching test
test
test
test
input()
...
Merge branch 'bugfix'
Merge branch 'master' into py3
test
test2
merged
added main()