copy edit
fix merge conflict
fix broken link (again)