fixed merge conflict issues