fixed weird merges