Add config.json and fix compatibility issues
Fix merge conflicts