Resolved readme conflict