Merge stuff back