merge celanup