line 10 to cause conflicts with stash