fixed merge issues in readme