Admin Dashboard conflicts fixed