Final edits to fix merge conflicts