Revert "Revert "fixed merge (i hope)""

This reverts commit bfbd376908d48f971b53aff050800ad396ca468b.