Revert "Remove the merge...dk why it did that"

This reverts commit 679c22d6b178ff0790636acb9748272a81860651.