removed unnecessary code and your tests
modified test and method
change files of merge