add readme
fixed conflict