Fixed merge conflict in HISTORY