Hairy merge in progress.
Merge complete!