Work on certificate upload from notifier configuration
fix conflict