Fixed configuration merge