argh merge conflicts, please work