Merged stash with pull
position failures
solved merge conflicts