extracted dash into partials
fixed merging errors