minor changes; x-val
resolved tiny conflict