1.1 merge