changed link
resolved conflicts