You forgot to fix this merge conflict.