fix MAV64 merge issues