attempt
add output
solve conflict