fix tirtos merge