changes
merging files
cheching errors
little correct