remove description
fixed readme
updated index
fixed conflict