fixed conflict in readme