rename field
update zip to reflect merged master