resolve conflicy