Fixed an error during the merge