Fix incorrect merge changes
Escape task names and such