County approves agreement to end suit over rezoning