Merge "Only use one 'END' per file"