remove merging issue bug