Please keep this file clean and REMOVE the line corresponding to the merge you
       perform
Merges to be made from the "dumb" source tree: