Add extra line
Add extra line 2. And amend.
Add 30
Merge branch 'branch2' of github.com:derek121/test into branch2

Conflicts:
	dir/file