merge heads in 3.3