Conflicts:
	src/MCPServer/share/mysql_dev1.sql