merge-parser: Mark files as local
merge-parser: Kill dead code
merge-parser: Correct hash assignment