Could your manager have helped figure this out? Even if they can't change anything, it can be helpful to loop your manager in so they aren't surprised if a simmering conflict erupts down the road.