Fixed some funky syntax created by a merge problem