index on master: a4a2d66 fixing a merge comflict that came from origin
On master: I am testing how the stash works