#5 merge cont