Ensure a consistent use of `$strPk` and `$intPk` and rename `safeMerge()` to `mergeRow()`