Fixes to conflict management. Added related test. Added remapping for revisions. Reactivated remapping test.