Updated reflection with conflict solution