answer conflicts and history check