fixed merge conflict
fixed some bugs
fixed m conflict
merge conflict
merge conflict