add some files
deal with conflicts