2.1 merge