Colombia Ecuador crisis over, leaders say