Update fe1 dependencies and solve conflicts

[matteosz]

Dependabot has reached a stale state where some PRs failed, conflicts needed to be merged manually

[github-actions]

Pull reviewers stats

Stats of the last 30 days for popstellar:

	User	Total reviews	Time to review	Total comments
	pierluca 🥇	2 ▀▀▀▀▀▀▀	2d 5h ▀▀	1 ▀▀▀▀▀
	jbsv 🥈	1 ▀▀▀	7d 22h 21m ▀▀▀▀▀▀▀▀	1 ▀▀▀▀▀

[sonarcloud]

Quality Gate passed for 'PoP - PoPCHA-Web-Client'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[sonarcloud]

Quality Gate passed for 'PoP - Be1-Go'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[sonarcloud]

Quality Gate passed for 'PoP - Be2-Scala'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[sonarcloud]

Quality Gate passed for 'PoP - Fe2-Android'

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

[CLAassistant]

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}