init repo
merge
add files