[WIP] Learn more conflicts 2