solve conflict after merging