fixed bug
fixed merge conflict