@nadineadel Resolve conflict