add new branch fearture1
add feartue1 for master commit
fixed the conflict