final edits for merge