Add file
Add on branch1 line
Add amend message
To rebase and squash before push
Merge branch 'branch1'

Conflicts:
	dir/file