11/8 merge