fixed a bug
fixed merge conflict