Added name to list in README file
fixed conflict