Revert "Revert "Fixing Merge Issues""

This reverts commit ab4556c25cc49672d45e6d8239d1263f8fc2cc1d.