hide close btn
fix conflicts