update website
remove conflict files.