https://blog.csdn.net/qq_31112205/article/details/103046794
linux vm options,Linux/Windows 部署 Tomcat 配置用户环境变量 VM Options
You have not concluded your merge (MERGE_HEAD exists).