Made comments in History Manager
Fix merge conflict in History Manager