fix: race condition when activating auto-merge, now handled gracefully

Signed-off-by: Frederic BIDON <fredbi@yahoo.com>

Author: fredbi