This caused a massive merge conflict. That is why there appears to be two of the same commit message.
