Finally readme conflict solved