i forgot to commit :(
fixed merge conflict katie name
Merge branch 'katie'