updated, update conflict message
removed stray capital letter
added space to + conversion in hrefs