with attention
Fixing conflicts