fixed weird merging issue