reslove confict