admin commands
fixed merge