Fixed merge error

Should have done a compile-test... fortunately there's TravisCI.