Fix weird merging issue