Fix comment style for merge

src/main/java/teammates/sqllogic/core/AccountRequestsLogic.java

@@ -105,30 +105,25 @@ public List<AccountRequest> getPendingAccountRequests() {
     }
 
     /**
-     * Creates/resets the account request with the given email and institute such
-     * that it is not registered.
+     * Creates/resets the account request with the given email and institute such that it is not registered.
      */
     public AccountRequest resetAccountRequest(String email, String institute)
             throws EntityDoesNotExistException, InvalidParametersException {
         AccountRequest accountRequest = accountRequestDb.getAccountRequest(email, institute);
 
         if (accountRequest == null) {
             throw new EntityDoesNotExistException("Failed to reset since AccountRequest with "
-                    + "the given email and institute cannot be found.");
+                + "the given email and institute cannot be found.");
         }
         accountRequest.setRegisteredAt(null);
 
         return accountRequestDb.updateAccountRequest(accountRequest);
     }
 
     /**
-     * Deletes account request associated with the {@code email} and
-     * {@code institute}.
+     * Deletes account request associated with the {@code email} and {@code institute}.
      *
-     * <p>
-     * Fails silently if no account requests with the given email and institute to
-     * delete can be found.
-     * </p>
+    * <p>Fails silently if no account requests with the given email and institute to delete can be found.</p>
      *
      */
     public void deleteAccountRequest(String email, String institute) {

src/main/java/teammates/storage/sqlentity/questions/FeedbackRankOptionsQuestion.java

@@ -33,7 +33,8 @@ public FeedbackRankOptionsQuestion(
             String description, FeedbackParticipantType giverType, FeedbackParticipantType recipientType,
             Integer numOfEntitiesToGiveFeedbackTo, List<FeedbackParticipantType> showResponsesTo,
             List<FeedbackParticipantType> showGiverNameTo, List<FeedbackParticipantType> showRecipientNameTo,
-            FeedbackQuestionDetails feedbackQuestionDetails) {
+            FeedbackQuestionDetails feedbackQuestionDetails
+    ) {
         super(feedbackSession, questionNumber, description, giverType, recipientType,
                 numOfEntitiesToGiveFeedbackTo, showResponsesTo, showGiverNameTo, showRecipientNameTo);
         setFeedBackQuestionDetails((FeedbackRankOptionsQuestionDetails) feedbackQuestionDetails);

src/main/java/teammates/ui/webapi/CreateAccountRequestAction.java

@@ -20,8 +20,7 @@ AuthType getMinAuthLevel() {
 
     @Override
     void checkSpecificAccessControl() throws UnauthorizedAccessException {
-        // Nothing needs to be done here because anybody should be able to create an
-        // account request.
+        // Nothing needs to be done here because anybody should be able to create an account request.
     }
 
     @Override