123684 fix conflict

apps/app/src/components/Admin/Users/PasswordResetModal.jsx

@@ -24,6 +24,7 @@ class PasswordResetModal extends React.Component {
     this.resetPassword = this.resetPassword.bind(this);
   }
 
+  // Reset Password
   async resetPassword() {
     const { t, userForPasswordResetModal } = this.props;
     try {