Merge conflict resolved after applying stash