simple example
Merge remote-tracking branch 'origin/master'

Conflicts:
	init_db.py