Updating new expressions with grammar changes
resolving merge