* 0.8.2 fixed conflicts in ChangeLog.txt