Merging changes...