modified:   create-branch
Create-branch conflict resolved
add new line into create-branch file
Merge branch 'branch-1' into branch-2

Conflicts:
	create-branch
add create-branch to branch-1