add sample2
clear conflict sample