resolve coflict