Revert Merge Branch

Hopefully fixes the Git