New file for demonstrating conflicts