+ constants, register method
recover from bad merge