test stash and solve conflict