Re-merge server and admin repositories