Add constant to SERVER and adjust conflicts