simplify collections in proto ast
simplify collections in proto ast
solve merge conflicts