fixed a bug related to merge issues.