Fix readme file conflict