chatLog before first merge -kh
Resolved conflict ChatLog.java
close file stream ChatLog