Something I must have done to fetch and memory
Merge resolution