Merging & more edits