# Conflicts: # config/application.properties # src/main/java/com/sy/IMF/IMF_Tesk.java # src/main/java/com/sy/IMF/KAKO_Sender.java