Parsing fix

Merge doesn't have line diff, which screw up a lot of things.