Ryan's an idiot

forgot to clean up the merge conflict artifacts