Conflict Library #449

Conflict Library — Micron

Issue: #449