fixing task merge