Last commit before ClassMate modifies my code