add constants
settle conflict