report done
merge fixed