stash test
confilicts