commit to pull
fixed merge conflicts