trying to fix merging in pr-scala-per-commit