Somebody messed up the git repository with his merge. The only choice is to get back and throw away all changes before his commit. The problem is that the develop
develop