When we merged from master to beta yesterday, we should have used our merge script and then NOT used the squash option when merging the PR as this results in future merges by the automation to not know how to resolve certain merge conflicts.
This PR has the changes from running our merge script and resolving the resulting merge conflicts.
When we merged from master to beta yesterday, we should have used our merge script and then NOT used the squash option when merging the PR as this results in future merges by the automation to not know how to resolve certain merge conflicts.
This PR has the changes from running our merge script and resolving the resulting merge conflicts.
Note: DO NOT use the squash option when merging