Fixed merge cruft.