add pull
fixed merge conflict