text tightening
fix conflicts