Argh merge corruption fix