Conflict Library #624

Conflict Library — Micron

Issue: #624