[fix] style
[fix] updated conflicts gui