master: resolve confilcts with the README