State - City handler
Resolved conflict and added rolling file