My first html text
merged
startingJavaScriptFile
fixed merges