cosmetics
fix conflict
text fix