add brance feature1
& simple
conflict fixed