Fix dependencies (follow-up for issue 6892)
Resolve conflict