Conflict basics done