updating before pull
fixed merge conflict