incorrect merge resolution for admin.js corrected