Merge with pending changes