Sally looked up at everyone entering the room. "Well it looks like the conflict was over." She said