+ error introduced during merge