add and
add &
conflict fixed