Conflicting change possibly needing merge tool
