dropletController merge
controller change merge