Fixed link format in markdown files
Fixed conflict