fixed text position  (merge glitch..)