fix bugs
add files
merge