xp xiugai
solve confilct