fixed merge bug. tests passing