Fix conflict in readme