changed permissions for server
Added merge command to super setup