eslipse的MANIFEST.MF文件git冲突