merge blktap3