Got rid of left over text from merge conflicts that was causing an error