merge
Fixes a bug caused by removing concat from lineman

Dist should now actually work