who does oliver end up with in american housewife