4.3.4 merge