merge stuff in