RESOLVER CONFLICTOS