States introduced, Should resolve key conflict