merge stash
fix merge conflicts