#22. Resolve conflict.