The merge conflict is here and is because I've renamed the variable 'k' to 'outputsIdx'. When you update your pull request, that's all that needs to happen for it to resolve the conflict.