Forgot to fix a merge. Fixed