fix an issue caused by merging