City and OHPA reach agreement