fix rebase errors and formatting
Passed
Benjamin Gallois
created pipeline for commit 53889608
, finished
Related merge request !216 to merge 114-offences-testing
16 minutes 48 seconds, queued for 3 seconds