add and simple
add & simple
fixed conflict