berry-pick: removed TODOs that I won't do
bump git version
hooks: write line length markers