Created /should_be_displayed.txt
merging: Created /should_be_displayed.txt