Readme git conflict resolved.