Updated merge, no longer recomputes everything but only deals with relevant clusters