add breked files
fix bug
merge