updated readme

conflict resolved in readme