Fixing conflicts in config