fixes for broken url
resolved conflicts