changed thread page
resolved conflicts