Merge stuff removed