Revert "Fixing Merge Issues"

This reverts commit aad36e01efd8c03b1c9b6daf1948a0d0c84b6119.