fixed foundation
conflict resolved