Resolvuig all conflicts