resolve conflct