Residents, Country Caboose owner clash again; Board recommends changes to city code