Organization merge with master