Merge pending changes