commit change to new branch
and simple
& simple
conflict fixed