merge edits done, hopefully..."