Fixed merge damage and updated README.