fix UI
fix conflicts