fixed text
added text
 merge resolutions