Get rid of extraneous #####'s from merge