Properly merge changes