flax

4c9d11fd - Merge pull request #5381 from samanklesaria:variables-in-merge