fix failing ci + merging conflicts