Added additional information on diffing file versions and merging.