Use conflict to clarify strategy

Hello David & Rob, please login.