Merge went wrong, argh