installed foundation
fixed merge conflicts