Tidied up README to resolve conflict.