fixed pop
merge conflict