When you find city permitting rules conflicting with the state's permitting rules, you will have to check which rules are more strict, and the follow the ones that are strict. If the city's are more restrictive, you will have to follow city rules, and vice versa. However, it would be wise to consult an expert and avoid any future complications.