updated code survey reports
conflict removed