update manual error in changelog while merging