rebase1
rebase2
make conflicts
 rebase1
rebase2
make conflicts
Merge branch 'feature/rebase' of https://github.com/KevinZuo86/git_workflow into feature/rebase

Conflicts:
	a.txt
Merge branch 'feature/rebase' into develop