update readme, delete merge conflict files