text change3
text change vmaster
text merge fixed