fixed merge conflict. my data

fixed merge conflict. my data