Updated text labels
Fixed merge conflict