Create-branch conflict resolved
add create-branch to branch-1
remove create-branch file on branch-1