attribute got dropped in a bad merge