3.5 merge