beginning of example
Merge remote-tracking branch 'origin/master'

Conflicts:
	Setting_Up/databaseSetup.tex