Testing new configurations
Merge conflict