Consolidate NYC branch and London branch into master