Name working-not displayed
Fixed conflicts