Revert "Figuring out merge"

This reverts commit 514796d0e915d2069e75b344aa8380ff757bc0bc.