dummy commit
handled merge conflict
made changes to hasnext and popcommit