Attempt to fix silly git merge conflict.