fix some production errors
Resolve a merge conflict