restet to working version
merge conflict with head reset