merge tankColumn mesh branch