The City is NOT responsible for ensuring proper drainage on privately owned property. If it is impossible to remedy the problem by working with your neighbor, then civil court action may be taken. This should be a last resort to resolving drainage problems. Only if the neighbor is diverting or impounding water against its natural flow or unnaturally concentrating the flow would the neighbor likely be liable for damages. If water is flowing as it naturally would, then the neighbor likely has no liability. Property owners are responsible for maintaining drainage on their own property. You could also consider a licensed Professional Engineer with expertise in storm drainage to examine alternative solutions.