tried to update controller and assets
attempt to fix merge error
fixed dropdown