Bad merge. *Please* make sure each thing actually runs before requesting a pull.