removing dead code
update deps
update styles
cleanup code style
updating assets after a merge