add linux stuff
fix conflicts