prepping for pull
completing the merge