Added merge functionality for admin andcleaned error