Merging 1.1