Add all the files
Fixed conflicts