Road types sorting instead of Length
Restoring files after conflicts
Conflict resolved