Merge current changes