chnage title text
conflicts resolved