RSM module recover from old merge conflict