change by git-centos
deal with the conflict