A new idea
Fixing conflicts