partial output
solve conflict