add .
fixed merge conflict