1st commit
fixed readme conflict