Updated config.json to resolve conflicts.