merge stuff removed