new edits, merging margins