Fix error when merging