initial edits to final run-through
fixed conflicts