fixed merge bug and test file