update README
dummy commit to re deploy the app
fix merge conflicts