1.3 merge