Properly merge stuff