Shane stucks
Resolved Conflicts