[Fix] foundation
[Fix] merge