City resolves dispute with internet service provider