changed url in comment
resolved conflicts