updated readme file
fixed readme conflict