Merged.
With modified ignore.