Fix the conflict when merge files