changes
conflict
changed nav bar to flag theme