text added
merge fixed