updated REDAME file
fixed merge conflicts