Updated readme file
Updated README conflict