preparing to pull
fixed merge error