Manual merge of stuff.