Conflicting bugs added