Church, city agree on parking