Merge flax repo