Revert "Merging Fix V2"

This reverts commit 7c8382d90ed72975f415990cfa4f6d0a07075f20.