Fixed merge conflict.  God that was awful.