merge my stash before pulling
took joshs changes