clean up box repo
fix conflict