fix merge isssue