Oops. Removing merge diff junk