reset implemented
push
merge errors fixed