before pull
modify extension file
remove conflict