Fixed README
fixed merge