fixed some bugs
in order to merge
in order to merge
test git files