Resolved an annoying merge conflict.