correct readme version
updating metadata
fixing merge conflict