1.02 merge