actually fixed merge conflict
implementing push/pop
fixing merge conflict