merge?
Fixed pop, Ret
Debugging infinite loop
merge