"file" block
Merge & ignore .orig