fixed merge conflict correctly