Admin panel merge with trunk