fixed more conflict issues. all working now.