finally can commit again, and finally everything is partially fixed after massive shitstorm