file setup
fixed merge conflict in readme