Fixing the merge conflict.  Thanks @Matt Thomas