nothing new
Attempt to resolve conflict