Forgot one merge conflict, fixed