Update publisher.json
fix conflicts