Fixed mapping example
Merge conficts