resolve Conflicts:
	migration/changelog.xml
	notes.txt