Revert "Remove unsuccessfull merge"

This reverts commit 09b7636c513a80679f9717a327f681a350deb937.