dev1 : a changed by feature1 changed in feature1, added in master ,commited in feature1 added by feature2 modified by master nihaoshijie modified by feature1 added by new branch dev added by master added by dev
a new line after master deleted the README.md by dev
dev <<<<<<< HEAD
this is a change by dev1 <<<<<<< HEAD
this is debugged by dev1 half this is debugged by dev1 full
dev1