updated the conflicts section after a chat with @scopatz