content edits
Fix merge conflicts on Louisa's info