replacing the images
incrementing version
merging conflict
	www/config.xml
	www/index.html