server aliases
fix merge