linux stuff
merge conflicts
change headign