[vix-skin] remove un-need conflicts.