Added warning message
Attempted to resolve conflicts