Removing merge junk?