Fixed an error that occurred in merge