fixed tiny merge bug. all tests pass.