Remove merge cruft (thx, @cam156\!)