Removed merge error cruft. Thanks, git.