fix(GAT-6216): Add in force and rebase to avoid conflicts

[JamieByrneHDRUK]

Screenshots (if relevant)

Describe your changes

Issue ticket link

Environment / Configuration changes (if applicable)

Requires migrations being run?

If not using the pre-push hook. Confirm tests pass:

Checklist before requesting a review

• I have performed a self-review of my code
• I have added appropriate unit tests
• I have created mocks for unit tests (where appropriate)
• I have added appropriate Behat tests to confirm AC (if applicable)
• I have added Swagger annotations for new endpoints (if applicable)
• I have added audit logs for new operation logic (if applicable)
• I have added new environment variables to the .env.example file (if applicable)
• I have added new environment variables to terraform repository (if applicable)

[github-actions]

🚨 Invalid PR title format!

Your PR title must follow one of these formats:

• feat(GAT-1234): Your title
• fix!(GAT-5678): Breaking change
• RELEASE: vX.Y.Z

Please update your PR title accordingly. 😊

[github-actions]

🚨 Invalid PR title format!

Your PR title must follow one of these formats:

• feat(GAT-1234): Your title
• fix!(GAT-5678): Breaking change
• RELEASE: vX.Y.Z

Please update your PR title accordingly. 😊

[github-actions]

🎉 Great job! Your PR title follows the correct format. 🚀