resolved conflicts
updated links with correct URL