clean the codes
merge the files
resove the conflict files