Resolve conflitcs and update pv #91

Job	Run time
Gradle Build	2m 38s
Build Examples	1m 19s
Build Offline Docs	39s
PhotonClient Build	36s
Photonlib - Build Docker - Athena	5m 15s
Photonlib - Build Host - Win64	8m 31s
Photonlib - Build Docker - Raspbian	5m 32s
Photonlib - Build Docker - Aarch64	6m 25s
Photonlib - Build Host - macOS	3m 45s
Photonlib - Build Host - Linux	4m 55s
Build fat JAR - ${{ matrix.artifact-name }}	0s
run-smoketest-native	0s
smoketest-${{ matrix.image_suffix }}	0s
Build image - ${{ matrix.image_url }}	0s
Combine	15s
release	0s
	39m 50s

Provide feedback