fix missed merged lines