add some file
resove the conflict issues
delete configuration file