resolve merge conflicts

application/src/main/java/org/togetherjava/tjbot/config/Config.java

@@ -44,8 +44,8 @@ public final class Config {
  private final HelperPruneConfig helperPruneConfig;
  private final FeatureBlacklistConfig featureBlacklistConfig;
  private final String selectRolesChannelPattern;
- private final ApplicationFormConfig applicationFormConfig;
  private final String memberCountCategoryPattern;
+ private final ApplicationFormConfig applicationFormConfig;
 
  @SuppressWarnings("ConstructorWithTooManyParameters")
  @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
@@ -415,20 +415,20 @@ public String getSelectRolesChannelPattern() {
  }
 
  /**
- * The configuration related to the application form.
+ * Gets the pattern matching the category that is used to display the total member count.
  *
- * @return the application form config
+ * @return the categories name types
  */
- public ApplicationFormConfig getApplicationFormConfig() {
- return applicationFormConfig;
+ public String getMemberCountCategoryPattern() {
+ return memberCountCategoryPattern;
  }
 
  /**
- * Gets the pattern matching the category that is used to display the total member count.
+ * The configuration related to the application form.
  *
- * @return the categories name types
+ * @return the application form config
  */
- public String getMemberCountCategoryPattern() {
- return memberCountCategoryPattern;
+ public ApplicationFormConfig getApplicationFormConfig() {
+ return applicationFormConfig;
  }
 }