git reset was thrown
Merge branch 'master' of https://github.com/accessallow/pro1