fix merging issue