revert to ArithExpr master - this will break stuff, but it fixes git problems
revert to ArithExpr master - this will break stuff, but it fixes git problems

lift-project/lift,lift-project/lift,lift-project/lift,lift-project/lift,lift-project/lift