fixing weird merging issue