solve conflict in masterHUGO