History check/check-conflicts