install foundation
fix merge conflict