Fix to add floating task
Resolve conflict to merge