Tyrone resolves another conflict that occured from previous conflict