create branch quickly
and simple
& simple
confict resovle