Conflicts: client/src/main/java/ru/trader/controllers/MainController.java client/src/main/java/ru/trader/controllers/PathsController.java client/src/main/java/ru/trader/controllers/RouterController.java client/src/main/java/ru/trader/controllers/Screeners.java client/src/main/java/ru/trader/controllers/SettingsController.java