Rename of file and edit placeholder text
Fixed conflict