Fixing example
Fixing conflicts