fixes for task merging