Solve conflict in X61