some conflicts
solved?
news si book