resolving conflct