Clone Poole
Resolve conflict