add my name
solve conflict