add new class hide
fix conflicts