Cleaner code in configuration view
Resolving conflict