build a new branch and use it
prepare to make conflict
making conflict
making conflict in dev branch
made a conflict
fixed the conflict