Fixed merge conflict from stash