Added zone into reg column
Dealt with merge conflicts