Add empty option in dropdown
Fix conflicts