add by linux
resolve conflict