5th attempt to resolve a conflict issue