AND simple
& simple
conflict fixed
dev branch
the git tool