change bad merge in the readme