solve a remaining merge conflict in the readme