merge all branches
add files to ignore