branch clean up
Fix merge conflicts in ApplyMappingMatrix algo.