Manual merge; Don't say anything about lost work.

>.<