Remove line breaks from address field
Split ZIP and City, State
resolve merge conflict