laga restar af conflict á master