fixed merge conflict issue