* solve conflict