diplomatic

Diplomatic means being kind and polite to other people, especially when there is a disagreement. For example, if two friends are arguing about which game to play, a diplomatic person would listen to both friends and try to find a game that makes everyone happy.