add sample
&add sample
confilic fixed