Gem skeleton
Conflict resolution