Fix Conflicts:
	migration/changelog.xml
	myjoin.sql