fixed merge edits