and simple
& simple
conflict fixed
add merge
conflicts fixed