Conflict resolution is the process by which two or more parties reach a peaceful resolution to a dispute.
Assertiveness is communicating your opinions, feelings, and needs in a way that is clearly understood by others without disrespecting their opinions, feelings, and needs. Learn more about assertive communication.
Reaching a peaceful resolution that both parties are in agreement with. This generally involves both parties making concessions.