some minor optimizations.
resolved merge issue
more conflict res
errant W