fixed merge conflict bug