My resoleve conflicts