Resolve conflict in Marshall