dynamic text change
fixing merge conflict