Adjusting post commit after pull
cleaned up merge conflicts and foundation
Fixing merge conflicts again