Cleaner sign opts handling with merge