it is really ..., the git problem is detected. I have fixed it, and my
paper is done. All the things work fine now.
Merge branch 'master' of https://github.com/lihebi/drs
solved conflits
Conflicts:
	a.txt
	aggregate-trace.txt
	env.sh
	extensions/chrono/chrono-app.cc
	extensions/chrono/chrono-app.h
	extensions/drs/drs-app.cc
	extensions/drs/drs-app.h
	extensions/hebi.cc
	extensions/hebi.h
	libextensions.so
	rate-trace.txt
	scenarios/drs.cc