Fixing syntax error at #39.

There was an additional <<<<<< HEAD remaining in file from the manual merges.