Convert to unix line endings; re-add split direction and gOt/gOT maps
Finish merge
Resolve merge
Resolve merge
Fix splitdirection function and command