latex report
some local changes
merge changes