resolve [verb] + conflict [adjective]