Revert "fixing conflicts Sat morning"

This reverts commit 2d18163670b910927675788c28791890a2f07fbf.