You win, intelliJ
Merge commit '794015'