make settings disable
fix conflicts