Refs #58 - Fix merge conflict resolution typo