resolved thilina's conflicts