fixing some compile conflicts