Fixed bad merging

Hello,

For now, the merge doesn't work, the configuration is overrided. by the last.