git 5 modify
deal confilict