fixed the merge by systematic comparison of merged and pre-revert
version