merged production edits