Fixed admin/master merge