Merge with changes